FISH-6607: Introduce core-parent #6246

pdudits · 2023-03-24T16:37:49Z

Description

Oooh, it's a big one. Build separation of core modules from the other ones, while not moving them away from their current locations in source tree.

The modules that had core in groupId now have parent core-parent, and version 6.0.0-SNAPSHOT
all these modules are removed from their previous parents and aggregates and are aggregated with core-aggregator (which is not their parent now, but one level higher)
any dependencies core modules had are now managed via core-bom. (and payara-bom reexports core-bom)
any properties required for those and parent setup moved to core-aggregator
therefore core-aggregator is parent of payara-aggregator so that we don't have duplicated properties

All of that was plugged back to old aggregator, so that no immediate change to build process is required.

It wasn't the aim of remove duplication of all of the plugin configs and such, rather to keep core-parent minimal, as it will grow another responsibilities. Therefore non-core modules did not get core-parent as (transitive) parent.

I think this is best reviewed by commits:

406fefb introduces core-aggreator, moving properties into it
d570565 adds core-parent
next commits add modules that turned out to be dependencies of core
except for metro-xmlsec-repackaged which shouldn't have been in core
969dcfc then replaces all places that referred to core modules with explicit ${project.version}. There were lots of them.
Then relevant modules to allow for making admingui plugins were added (console-common and its dependencies)
And as a verification I transformed certificate-management to only depend on payara-core in b93b560

Testing

Testing Performed

Builds with empty repo, starts, payara-samples pass.
core/ builds with empty repo on its own.

Testing Environment

Maven 3.9.2, Ubuntu 22.04, Zulu-11

Properties required for build of core modules moved into core-aggregator as well, core-bom moved to core. # Conflicts: # api/payara-api/pom.xml # api/payara-core-bom/pom.xml # nucleus/packager/external/pom.xml # pom.xml

pdudits · 2023-03-24T16:37:59Z

Jenkins test please

Pandrex247

Doesn't build with a clean repo using the BuildExtras profile

[ERROR] Failed to execute goal on project certificate-management-cli: Could not resolve dependencies for project fish.payara.extras.certificate-management:certificate-management-cli:glassfish-jar:6.2023.4-SNAPSHOT: Could not find artifact fish.payara.server.internal.cluster:cluster-common:jar:6.2023.4-SNAPSHOT

pdudits · 2023-03-27T07:25:52Z

Fixed that one. But it opens a question of certificate-management in general. Do you feel it should be eligible to be out-of-tree component? Because it still has few internal dependencies that should move to core in such case - server-mgmt, cluster-cli and some admingui ones.

Pandrex247 · 2023-03-27T11:15:24Z

Yes certificate management should be an external component.
The only reason it still exists in the codebase is because it was created before we had such a process and we never went back to it.

Pandrex247 · 2023-03-27T11:54:39Z

Given that we're releasing Enterprise 6.0.0 now - should the core version still be 6.0.0 or should it be 6.1.0 (or higher)?

Pandrex247

Yeah I think I need a sit down with you and a whiteboard.

pom.xml

api/payara-api/pom.xml

core/core-parent/pom.xml

core/pom.xml

Moved over the two utility methods it depended on. Moved single used method from JSONUtil to new JsonUtil as well.

unsure about the change in pom.template.xml, sorry if I broke something

Pandrex247 · 2023-04-05T14:34:01Z

Also is this intentionally not building the l10n modules as a part of core?

Pandrex247 · 2023-04-06T14:10:31Z

Also also, isn't the api/pom.xml a little pointless now?
It's now a parent pom for one child module (payara-bom).

pdudits · 2023-04-06T15:06:46Z

it doesn't seem to be possible to generate sources or javadoc specifically for the core modules

I agree, is this something we can put on backlog, or does it needs solving right now?

Also is this intentionally not building the l10n modules as a part of core?

They're not needed for building components, only for distribution, so yes, it was intentional.

Also also, isn't the api/pom.xml a little pointless now?

It is, bom should be treated as distribution artifact, but we're not quite there yet.

Pandrex247 · 2023-04-11T10:29:00Z

it doesn't seem to be possible to generate sources or javadoc specifically for the core modules

I agree, is this something we can put on backlog, or does it needs solving right now?

It depends where we're intending to deploy these.
If we're intending to deploy all of these core artefacts to Maven Central, then I believe it's still a requirement that anything that isn't a pom/bom still has to be deployed with javadoc and sources. While these can just be dummy files (e.g. containing a README), we'd still need to somehow script this for all of the artefacts.

If we're deploying to our own maven repository, then it would still be nice to have this set up. Past this singular point in time where currently everything is 6.0.0-SNAPSHOT, once it has been released the actual dependency version we're all going to be working from will be 6.0.0, whereas the version present in the checked out repo will presumably be 6.1.0 - our IDE's will throw a hissy fit.

Also is this intentionally not building the l10n modules as a part of core?

They're not needed for building components, only for distribution, so yes, it was intentional.

So the l10n stuff will have a completely separate release process? So we release core to wherever we publish it with its own version and it's own string substitutions, but then have what actually gets subtituted in released separately and with a completely separate version?

Also, thinking ahead to where the core exists in the future where it's possibly in its own repo, we're going to have the l10n stuff where? In this repo awkwardly divorced from what it's actually the text for?

Also also, isn't the api/pom.xml a little pointless now?

It is, bom should be treated as distribution artifact, but we're not quite there yet.

Are we not? Could you not just remove it in this PR? As of this PR it's a useless pom - you could leave the directory structure the same but simply remove the pointless pom and adjust the payara-bom to be a child of the top-level aggregator

In order not to immediately stiffle release process, core will for now match main version yet.

pdudits · 2023-04-21T13:24:19Z

Jenkins test please

pdudits · 2023-04-21T13:26:59Z

I dropped payara.core.version from dependency management -- mvn release:prepare completed up to the point where it wasn't properly configured and tried to immediately push a tag to github
Merged in current master, respecing version upgrades to Hazelcast and EclipseLink
Reset versions back to 6.2023.5-SNAPSHOT with mvn versions:set. Current state should not block releasing next version until we decide further details on how the core vs main release will be done, and fine tune the breadth of core modules.

appserver/extras/certificate-management/certificate-management-admin/pom.xml

appserver/extras/certificate-management/certificate-management-cli/pom.xml

appserver/extras/certificate-management/certificate-management-common/pom.xml

appserver/extras/certificate-management/certificate-management-console-plugin/pom.xml

appserver/extras/certificate-management/pom.xml

Co-authored-by: Andrew Pielage <[email protected]>

pdudits · 2023-04-24T08:52:04Z

Jenkins test please

Version changes applied in parent commit # Conflicts: # pom.xml

pdudits · 2023-05-11T12:13:25Z

Jenkins test please

# Conflicts: # api/payara-api/pom.xml # api/payara-core-bom/pom.xml # appserver/admin/admin-core/pom.xml # appserver/admingui/common/pom.xml # appserver/admingui/dataprovider/pom.xml # appserver/admingui/faces-compat/pom.xml # appserver/admingui/gf-admingui-connector/pom.xml # appserver/admingui/plugin-service/pom.xml # appserver/common/amx-javaee/pom.xml # appserver/common/annotation-framework/pom.xml # appserver/common/container-common/pom.xml # appserver/common/glassfish-ee-api/pom.xml # appserver/common/glassfish-naming/pom.xml # appserver/common/stats77/pom.xml # appserver/connectors/connectors-internal-api/pom.xml # appserver/deployment/client/pom.xml # appserver/deployment/dol/pom.xml # appserver/deployment/javaee-core/pom.xml # appserver/ejb/ejb-internal-api/pom.xml # appserver/extras/certificate-management/pom.xml # appserver/orb/orb-connector/pom.xml # appserver/orb/orb-enabler/pom.xml # appserver/packager/external/libpam4j/pom.xml # appserver/resources/resources-connector/pom.xml # appserver/security/core-ee/pom.xml # appserver/security/jaspic-provider-framework/pom.xml # appserver/security/webintegration/pom.xml # appserver/transaction/internal-api/pom.xml # appserver/web/admin/pom.xml # appserver/web/gf-web-connector/pom.xml # appserver/web/gui-plugin-common/pom.xml # appserver/web/war-util/pom.xml # appserver/web/web-core/pom.xml # appserver/web/web-embed/api/pom.xml # appserver/web/web-glue/pom.xml # appserver/web/web-naming/pom.xml # appserver/web/web-sse/pom.xml # nucleus/admin/cli/pom.xml # nucleus/admin/config-api/pom.xml # nucleus/admin/launcher/pom.xml # nucleus/admin/monitor/pom.xml # nucleus/admin/rest/rest-client/pom.xml # nucleus/admin/server-mgmt/pom.xml # nucleus/admin/util/pom.xml # nucleus/cluster/admin/pom.xml # nucleus/cluster/cli/pom.xml # nucleus/cluster/common/pom.xml # nucleus/cluster/ssh/pom.xml # nucleus/common/amx-core/pom.xml # nucleus/common/common-util/pom.xml # nucleus/common/glassfish-api/pom.xml # nucleus/common/internal-api/pom.xml # nucleus/common/mbeanserver/pom.xml # nucleus/common/scattered-archive-api/pom.xml # nucleus/common/simple-glassfish-api/pom.xml # nucleus/core/api-exporter/pom.xml # nucleus/core/bootstrap/pom.xml # nucleus/core/kernel/pom.xml # nucleus/core/logging/pom.xml # nucleus/deployment/common/pom.xml # nucleus/flashlight/framework/pom.xml # nucleus/grizzly/config/pom.xml # nucleus/grizzly/nucleus-grizzly-all/pom.xml # nucleus/hk2/config-types/pom.xml # nucleus/hk2/hk2-config/pom.xml # nucleus/packager/external/j-interop/pom.xml # nucleus/packager/external/jmxremote_optional/pom.xml # nucleus/packager/external/ldapbp/pom.xml # nucleus/packager/external/opentelemetry-repackaged/pom.xml # nucleus/packager/external/opentracing-repackaged/pom.xml # nucleus/packager/external/tiger-types/pom.xml # nucleus/packager/external/trilead-ssh2/pom.xml # nucleus/payara-modules/hazelcast-bootstrap/pom.xml # nucleus/payara-modules/healthcheck-core/pom.xml # nucleus/payara-modules/healthcheck-stuck/pom.xml # nucleus/payara-modules/opentracing-adapter/pom.xml # nucleus/payara-modules/payara-executor-service/pom.xml # nucleus/payara-modules/requesttracing-core/pom.xml # nucleus/resources/pom.xml # nucleus/security/core/pom.xml # nucleus/security/services/pom.xml # nucleus/security/ssl-impl/pom.xml # nucleus/test-utils/utils/pom.xml # pom.xml

pdudits · 2023-05-16T15:00:03Z

Jenkins test please

pdudits · 2023-05-22T12:27:13Z

Jenkins test please

pdudits · 2023-05-22T15:09:38Z

Jenkins test please

pdudits added 13 commits March 24, 2023 16:24

FISH-6607: Move core module under core aggregator

406fefb

Properties required for build of core modules moved into core-aggregator as well, core-bom moved to core. # Conflicts: # api/payara-api/pom.xml # api/payara-core-bom/pom.xml # nucleus/packager/external/pom.xml # pom.xml

FISH-6607: Introduce core-parent to core modules

d570565

FISH-6607: Move test-utils to core packages

f0c8a88

FISH-6607: Add opentelemetry BOM to core

d2f7e22

FISH-6607: Add trilead-ssh2 to core

8ae06c6

FISH-6607: Add j-interop to core

5c95102

FISH-6607: Add cluster-common to core

cc60e60

FISH-6607: add cluster-ssh to core

89828be

FISH-6607: Add opentelemetry-repackaged to core

52a89bd

FISH-6607: Add cluster-admin to core

b8e3e9b

FISH-6607: Depend on managed versions of core modules

ff9030b

FISH-6607: Drop core designation from metro-xmlsec-repackaged

969dcfc

FISH-6607: Fix references of payara-api to use managed version

f01e19c

pdudits requested review from aubi and Pandrex247 March 24, 2023 16:37

Pandrex247 requested changes Mar 24, 2023

View reviewed changes

FISH-6607: Fix BuildExtras profile

8879e28

Pandrex247 reviewed Mar 27, 2023

View reviewed changes

pom.xml Show resolved Hide resolved

pom.xml Outdated Show resolved Hide resolved

api/payara-api/pom.xml Outdated Show resolved Hide resolved

core/core-parent/pom.xml Outdated Show resolved Hide resolved

core/pom.xml Show resolved Hide resolved

Pandrex247 self-requested a review March 27, 2023 15:38

pdudits added 7 commits March 29, 2023 16:48

FISH-6607: Add server-mgmt to core

a5190f9

FISH-6607: Add cluster-cli to core

b5f89fc

FISH-6607: Add gf-admingui-connector to core

a5397c5

FISH-6607: Add console-plugin-service to core

e9012b9

FISH-6607: Remove dependency of console-common on rest-service

278ec5d

Moved over the two utility methods it depended on. Moved single used method from JSONUtil to new JsonUtil as well.

FISH-6607: Add rest-client to core

add7eea

unsure about the change in pom.template.xml, sorry if I broke something

FISH-6607: Add deployment client to core

91c3cce

pdudits added 5 commits April 21, 2023 13:42

Sync version changes from master

1e1dacc

Merge remote-tracking branch 'origin/master' into fish-6607

95089bb

Don't use payara.core.version expression in dependency management

66d59d1

Undo core version change

3348e0a

In order not to immediately stiffle release process, core will for now match main version yet.

Drop SCM tag in core

d61caf6

pdudits requested a review from Pandrex247 April 21, 2023 13:24

Pandrex247 requested changes Apr 24, 2023

View reviewed changes

Fix versions of certificate-management

c5a01ca

Co-authored-by: Andrew Pielage <[email protected]>

Pandrex247 approved these changes Apr 24, 2023

View reviewed changes

pdudits added 2 commits May 11, 2023 14:10

Update versions from master

de4d0c8

Merge remote-tracking branch 'origin/master'

6e3081e

Version changes applied in parent commit # Conflicts: # pom.xml

pdudits force-pushed the fish-6607 branch from f0956b9 to 1e1411a Compare May 22, 2023 12:19

Sync changes from master, update versions

c6d3489

pdudits force-pushed the fish-6607 branch from 1e1411a to c6d3489 Compare May 22, 2023 12:26

pdudits merged commit 3a0d7a3 into payara:master May 23, 2023

Pandrex247 mentioned this pull request May 23, 2023

FISH-6607 Fix Admin Console OSGi imports and Fragments #6285

Merged

This was referenced Jun 5, 2023

FISH-6607 Don't skip javadoc on EJB HTTP Client #6295

Merged

FISH-6607 Don't skip javadoc on EJB HTTP Client (Release) #6296

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FISH-6607: Introduce core-parent #6246

FISH-6607: Introduce core-parent #6246

pdudits commented Mar 24, 2023 •

edited

Loading

pdudits commented Mar 24, 2023

Pandrex247 left a comment

pdudits commented Mar 27, 2023

Pandrex247 commented Mar 27, 2023

Pandrex247 commented Mar 27, 2023

Pandrex247 left a comment

Pandrex247 commented Apr 5, 2023

Pandrex247 commented Apr 6, 2023

pdudits commented Apr 6, 2023 •

edited

Loading

Pandrex247 commented Apr 11, 2023 •

edited

Loading

pdudits commented Apr 21, 2023

pdudits commented Apr 21, 2023

pdudits commented Apr 24, 2023

pdudits commented May 11, 2023

pdudits commented May 16, 2023

pdudits commented May 22, 2023

pdudits commented May 22, 2023

FISH-6607: Introduce core-parent #6246

FISH-6607: Introduce core-parent #6246

Conversation

pdudits commented Mar 24, 2023 • edited Loading

Description

Testing

Testing Performed

Testing Environment

pdudits commented Mar 24, 2023

Pandrex247 left a comment

Choose a reason for hiding this comment

pdudits commented Mar 27, 2023

Pandrex247 commented Mar 27, 2023

Pandrex247 commented Mar 27, 2023

Pandrex247 left a comment

Choose a reason for hiding this comment

Pandrex247 commented Apr 5, 2023

Pandrex247 commented Apr 6, 2023

pdudits commented Apr 6, 2023 • edited Loading

Pandrex247 commented Apr 11, 2023 • edited Loading

pdudits commented Apr 21, 2023

pdudits commented Apr 21, 2023

pdudits commented Apr 24, 2023

pdudits commented May 11, 2023

pdudits commented May 16, 2023

pdudits commented May 22, 2023

pdudits commented May 22, 2023

pdudits commented Mar 24, 2023 •

edited

Loading

pdudits commented Apr 6, 2023 •

edited

Loading

Pandrex247 commented Apr 11, 2023 •

edited

Loading